Squash merge messages contain information about all commits by default. #35247
+174
−36
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
github-actions
bot
added
modifies/translation
modifies/go
hiifong
force-pushed
the
squash-merge-msg
branch
from
fca67b7 to
d328e00
Compare
github-actions
bot
removed
modifies/translation
modifies/templates
lunny
reviewed
Aug 11, 2025
Contributor
|
Please split And it needs tests to cover the changed logic (although old code doesn't have enough tests, new code should have when the logic is complex) |
Contributor
|
This part seems not right, 
|
Member
Author
Done. 
|
Member
Author
|
Let me spend some time researching how to add tests. |
Member
|
Style nit: there should be no empty line between such metadata lines. |
* main: [skip ci] Updated translations via Crowdin Fix LFS range size header response (go-gitea#35277) Skip "parentsigned" check when the repo is empty (go-gitea#35292) [skip ci] Updated translations via Crowdin Fix GitHub release assets URL validation (go-gitea#35287) nix flake use go1.25 (go-gitea#35288) go1.25.0 (go-gitea#35262)
wxiaoguang
reviewed
Aug 18, 2025
Member
|
@hiifong Thanks for your contribution. Any progress on this? |
* main: (34 commits) when sorting issues by nearest due date, issues without due date should be sorted ascending (go-gitea#35267) [skip ci] Updated translations via Crowdin Upgrade xz to v0.5.15 (go-gitea#35377) Refactor db package (go-gitea#35380) Remove the duplicated function GetTags (go-gitea#35375) [skip ci] Updated translations via Crowdin Allow foreachref parser to grow its buffer (go-gitea#35365) Remove global context from db package (go-gitea#35371) Use gitrepo.SetDefaultBranch when set default branch of wiki repository (go-gitea#33911) Deleting branch could delete broken branch which has database record but git branch is missing (go-gitea#35360) Remove incorrect "db.DefaultContext" usages (go-gitea#35366) Refactor to use reflect.TypeFor (go-gitea#35370) [skip ci] Updated translations via Crowdin Remove wrong "git.DefaultContext" (go-gitea#35364) Fix context usages (go-gitea#35348) Instance signing rule `pubkey` should allow all public keys, not just GPG (go-gitea#35357) Allow deleting comment with content via API like web did (go-gitea#35346) Prevent duplicate actions email (go-gitea#35215) rename nightly docker tag for main branch (go-gitea#35344) Fix atom/rss mixed error (go-gitea#35345) ... # Conflicts: # tests/integration/pull_merge_test.go
Member
Author
Done, |
Member
Author
already for review |
hiifong
force-pushed
the
squash-merge-msg
branch
from
1040c84 to
099ccf2
Compare
* main: [skip ci] Updated translations via Crowdin Use github.com/mholt/archives replace github.com/mholt/archiver (go-gitea#35390) Move some functions from package git to gitrepo (go-gitea#33910) Move git config/remote to gitrepo package and add global lock to resolve possible conflict when updating repository git config file (go-gitea#35151) Move HasWiki to repository service package (go-gitea#33912) Rename UpdateBranch API to RenameBranch API (go-gitea#35374)
wxiaoguang
reviewed
Sep 2, 2025
lunny
reviewed
Sep 2, 2025
Contributor
|
-> Use GitHub-style commit message for squash merge #35987 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This behavior is basically the same as GitHub, except for the dividing line I added.
screenshot: